From: Roger Pau Monne <roger.pau@citrix.com>
Date: Wed, 1 Aug 2012 11:46:47 +0000 (+0100)
Subject: tools/build: fix pygrub linking
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8109
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=108fdb564b06e58087a3ccfdad5996a878d39b9a;p=xen.git

tools/build: fix pygrub linking

Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same
as $(PRIVATE_BINDIR)

This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) ==
$(PRIVATE_BINDIR).

Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index bd22dd41f2..8c99e11b68 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -14,7 +14,10 @@ install: all
 		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-	ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
+	set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \
+	             `readlink -f $(PRIVATE_BINDIR)` ]; then \
+	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	fi
 
 .PHONY: clean
 clean: